bitkeeper revision 1.295 (3f0aa9beS_4RaA-JxGiBF8BRtuik6Q)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/groups/xeno/users/sos22/tmp/xeno.bk

diff --cc .rootkeys
Simple merge

diff --cc tools/internal/xi_build.c
index 4f9ef136ba6a2511e29f9214a7cd0c5418ca7ccf,04667530a7cbd09df1bd176f711d3aae0c4ffc81..1457281f74459b922e55bf4b81eae014af0295ec
--- 1/tools/internal/xi_build.c
--- 2/tools/internal/xi_build.c
+++ b/tools/internal/xi_build.c
@@@ -12,9 -12,9 +12,10 @@@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <stdlib.h>
 +#include <sys/ioctl.h>
  
- #include "hypervisor_defs.h"
+ #include "asm-i386/types.h"
+ #include "hypervisor-ifs/hypervisor-if.h"
  #include "dom0_ops.h"
  #include "dom0_defs.h"
  #include "mem_defs.h"

diff --cc tools/internal/xi_create.c
index 7ebf484e66bf4e7da234f7cc00537f6637f1d0fb,3e7649b1960b26d2d511dbebfd237a7a7e2ba923..7c3010aff246dcf9ed192c423a0d7259a8f3665d
--- 1/tools/internal/xi_create.c
--- 2/tools/internal/xi_create.c
+++ b/tools/internal/xi_create.c
@@@ -12,11 -12,8 +12,10 @@@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <stdlib.h>
 +#include <sys/ioctl.h>
 +#include <errno.h>
  #include <string.h>
  
- #include "hypervisor_defs.h"
  #include "dom0_ops.h"
  #include "dom0_defs.h"
  #include "mem_defs.h"

diff --cc xenolinux-2.4.21-sparse/fs/partitions/xeno.c
Simple merge